bitkeeper revision 1.1389.1.55 (4283d2abTQukZce4qzwxx1FWqaoLXQ)

page.h, init.c:
  phys is machine physical already.  So we shouldn't try to convert guest
  physical to machine physical.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c
index d50d2218e14ba1c6338356d395218548856d8ca7..c43d567c5b24b7dc505789cc37fa60934bcf2000 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c
@@ -328,11 +328,11 @@ static void set_pte_phys_ma(unsigned long vaddr,
                }
        }
 
-       new_pte = pfn_pte(phys >> PAGE_SHIFT, prot);
+       new_pte = pfn_pte_ma(phys >> PAGE_SHIFT, prot);
        pte = pte_offset_kernel(pmd, vaddr);
 
        if (!pte_none(*pte) &&
-           pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask))
+           pte_val_ma(*pte) != (pte_val_ma(new_pte) & __supported_pte_mask))
                pte_ERROR(*pte);
 
         /* 

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h
index 451fb11bb8f9ff60e8327cbf1a1a7782a7e88bf2..8acd7990dc761c2aa6d29e20bcc9695434559429 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h
@@ -92,6 +92,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #define pte_val(x)     (((x).pte & 1) ? machine_to_phys((x).pte) : \
                         (x).pte)
+#define pte_val_ma(x)  ((x).pte)
 
 static inline unsigned long pmd_val(pmd_t x)
 {